Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed an error description of func, and deleted redundant codes #10778

Conversation

miaoyq
Copy link
Contributor

@miaoyq miaoyq commented Sep 2, 2016

if kcmdutil.GetFlagBool(cmd, "parameters") || outputFormat == "describe" can't be executed.
The function will return in earlier if the condition is true.

@miaoyq miaoyq force-pushed the fix-a-err-description-of-func-and-del-invalid-code branch 2 times, most recently from 057bac9 to 01cf166 Compare September 2, 2016 07:38
@miaoyq miaoyq changed the title Fixed an error description of func, and deleted a redundant error check Fixed an error description of func, and deleted redundant codes Sep 2, 2016
@fabianofranz
Copy link
Member

[test]

LGTM, holding to merge post-1.3.

@fabianofranz
Copy link
Member

@miaoyq thanks for the PR!

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 17, 2016
@miaoyq miaoyq force-pushed the fix-a-err-description-of-func-and-del-invalid-code branch from 01cf166 to ed14146 Compare September 17, 2016 03:59
@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 17, 2016
@miaoyq
Copy link
Contributor Author

miaoyq commented Sep 24, 2016

@fabianofranz I have rebased the PR. Could you please trigger a test? Thanks!

@fabianofranz
Copy link
Member

[test]

@miaoyq miaoyq force-pushed the fix-a-err-description-of-func-and-del-invalid-code branch from ed14146 to d021dcf Compare September 27, 2016 00:51
@miaoyq
Copy link
Contributor Author

miaoyq commented Sep 27, 2016

The test still failed, but it didn't seem to be caused by the PR.
Could you please help to look at it? Thanks a lot! @fabianofranz

@fabianofranz
Copy link
Member

Flaked on #11094
re[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to d021dcf

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/9360/)

@fabianofranz
Copy link
Member

[merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Sep 27, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/9360/) (Image: devenv-rhel7_5085)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to d021dcf

@openshift-bot openshift-bot merged commit 6be8e0a into openshift:master Sep 27, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants